From 06008057b6d1ea26f2a077612fc9e0455bb200c2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 20 Apr 2002 23:59:48 +0000 Subject: [PATCH] remove leftover conflict marker. --- ChangeLog | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-2 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 6 files changed, 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21c2c75ab5..ac960e7772 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford * gtk/gtkcontainer.c (gtk_container_focus): include internal diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 21c2c75ab5..ac960e7772 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford * gtk/gtkcontainer.c (gtk_container_focus): include internal diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 21c2c75ab5..ac960e7772 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford * gtk/gtkcontainer.c (gtk_container_focus): include internal diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 21c2c75ab5..ac960e7772 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford * gtk/gtkcontainer.c (gtk_container_focus): include internal diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 21c2c75ab5..ac960e7772 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford * gtk/gtkcontainer.c (gtk_container_focus): include internal diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 21c2c75ab5..ac960e7772 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford * gtk/gtkcontainer.c (gtk_container_focus): include internal -- 2.30.2